In tests that use gpg, terminate the gpg-agent after testing

Otherwise we leak those processes.

Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #232
Approved by: cgwalters

diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
index 8d52bcaf85a26989408de5815966622d84a5582c..1b153e9a542a9db7648ed2e00207e04a016aa684 100755 (executable)
--- a/tests/test-commit-sign.sh
+++ b/tests/test-commit-sign.sh
@@ -132,5 +132,6 @@ if ${CMD_PREFIX} ostree --repo=repo show main | grep -o 'Found [[:digit:]] signa
 fi
 
 rm -rf repo gnomerepo-files
+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
 
 echo "ok"

diff --git a/tests/test-gpg-signed-commit.sh b/tests/test-gpg-signed-commit.sh
index a0bf983262f5b37096a5d0ebdc9aa547c33a65e7..096c0e1c55f3e7ec042681f490618fe5d424bece 100755 (executable)
--- a/tests/test-gpg-signed-commit.sh
+++ b/tests/test-gpg-signed-commit.sh
@@ -78,4 +78,6 @@ if ${OSTREE} show test2 | grep -o 'Found [[:digit:]] signature'; then
   assert_not_reached
 fi
 
+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
+
 echo "ok"

diff --git a/tests/test-pull-mirror-summary.sh b/tests/test-pull-mirror-summary.sh
index 20707a13ca0e88308c1d888515db9d8863753b6a..d5e27fc8f86ddd7ba1b79f983383fda7e2d3deaf 100755 (executable)
--- a/tests/test-pull-mirror-summary.sh
+++ b/tests/test-pull-mirror-summary.sh
@@ -121,3 +121,5 @@ echo "ok pull mirror with invalid summary sig and no verification"
 # assert_file_has_content deltas.txt "${origmain}-${newmain}"
 
 # echo "ok pull mirror with signed summary covering static deltas"
+
+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye

diff --git a/tests/test-pull-summary-sigs.sh b/tests/test-pull-summary-sigs.sh
index 202efdae017c4e3bd63ae56352f6f1c19160b0c8..dd2fcb0f6c38c729b03e3ab8a0974e125a48cf78 100755 (executable)
--- a/tests/test-pull-summary-sigs.sh
+++ b/tests/test-pull-summary-sigs.sh
@@ -133,3 +133,5 @@ assert_file_has_content summary.txt "Good signature from \"Ostree Tester <test@t
 grep static-deltas summary.txt > static-deltas.txt
 assert_file_has_content static-deltas.txt \
   $(${OSTREE} --repo=repo rev-parse origin:main)
+
+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye

diff --git a/tests/test-remote-gpg-import.sh b/tests/test-remote-gpg-import.sh
index bb0c4029b79242617b6df954c75360cc885b93f9..aa90eb891614a066bac22eb5d72b040435feca25 100755 (executable)
--- a/tests/test-remote-gpg-import.sh
+++ b/tests/test-remote-gpg-import.sh
@@ -143,4 +143,5 @@ if ${OSTREE} pull R2:main >/dev/null 2>&1; then
 fi
 ${OSTREE} pull R3:main >/dev/null
 
+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
 echo "ok"